Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[HOTFIX] Fix Blob Chemical #998

Merged
merged 2 commits into from
Jan 11, 2025
Merged

[HOTFIX] Fix Blob Chemical #998

merged 2 commits into from
Jan 11, 2025

Conversation

Roudenn
Copy link
Collaborator

@Roudenn Roudenn commented Jan 9, 2025

Срочный хотфикс для Регенеративной Материи блоба

Summary by CodeRabbit

  • Исправления
    • Улучшена логика восстановления здоровья для системы Блоба.
    • Добавлен модификатор восстановления здоровья в зависимости от химического типа.
    • Оптимизирован механизм лечения тайлов с более точным расчетом урона.

@Roudenn Roudenn requested a review from Rxup as a code owner January 9, 2025 17:48
Copy link
Contributor

coderabbitai bot commented Jan 9, 2025

Обзор

Walkthrough

В системе BlobTileSystem были внесены изменения в метод HealTile. Модификация затрагивает логику инициализации переменной healCore и введение нового параметра modifier. Теперь healing рассчитывается с учетом типа химического состава (BlobChemType), что позволяет динамически изменять интенсивность восстановления здоровья для сущностей.

Changes

Файл Изменения
Content.Server/Backmen/Blob/Systems/BlobTileSystem.cs Обновлена логика метода HealTile:
- Введена переменная modifier
- Изменён способ инициализации healCore
- Добавлена условная логика умножения урона на modifier

Poem

🐰 В мире блобов, где химия течёт,

Система healing новый ход найдёт!

Modifier танцует веселей,

Восстановление становится быстрей!

Кролик-программист смеётся: "Класс!" 🧪

Finishing Touches

  • 📝 Generate Docstrings

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (1)
Content.Server/Backmen/Blob/Systems/BlobTileSystem.cs (1)

172-182: Предложения по улучшению реализации лечения

Текущая реализация работоспособна, но есть несколько моментов для улучшения:

  1. Магическое число 2.0f лучше вынести в константу уровня класса
  2. Метод TryAdd может пропустить обновление значения, если ключ уже существует
  3. Отсутствует проверка DamageDict на null

Предлагаю следующие изменения:

+ private const float RegenerativeMateriaModifier = 2.0f;

 private void HealTile(Entity<BlobTileComponent> ent, Entity<BlobCoreComponent> core)
 {
     var healCore = new DamageSpecifier();
     var modifier = 1.0f;

     if (core.Comp.CurrentChem == BlobChemType.RegenerativeMateria)
     {
-        modifier = 2.0f;
+        modifier = RegenerativeMateriaModifier;
     }

+    if (ent.Comp.HealthOfPulse.DamageDict == null)
+        return;
+
     foreach (var keyValuePair in ent.Comp.HealthOfPulse.DamageDict)
     {
-        healCore.DamageDict.TryAdd(keyValuePair.Key, keyValuePair.Value * modifier);
+        healCore.DamageDict[keyValuePair.Key] = keyValuePair.Value * modifier;
     }

     _damageableSystem.TryChangeDamage(ent, healCore);
 }
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between ec2e67f and 4b500c9.

📒 Files selected for processing (1)
  • Content.Server/Backmen/Blob/Systems/BlobTileSystem.cs (1 hunks)
⏰ Context from checks skipped due to timeout of 300000ms (1)
  • GitHub Check: build (ubuntu-latest)

@Roudenn
Copy link
Collaborator Author

Roudenn commented Jan 11, 2025

@KayzelW мёрдж пожалуста

@KayzelW KayzelW merged commit 71d27ec into Rxup:master Jan 11, 2025
15 checks passed
@Roudenn Roudenn deleted the blob-hotfix branch January 11, 2025 17:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants